--- linux-3.18.8/arch/x86/boot/Makefile
+++ linux-3.18.8.patched/arch/x86/boot/Makefile
@@ -75,7 +75,8 @@
 
 SETUP_OBJS = $(addprefix $(obj)/,$(setup-y))
 
-sed-voffset := -e 's/^\([0-9a-fA-F]*\) [ABCDGRSTVW] \(_text\|_end\)$$/\#define VO_\2 0x\1/p'
+sed-voffset := -e 's/^\([0-9a-fA-F]*\) [ABCDGRSTVW] \(_text\)$$/\#define VO_\2 0x\1/p' \
+		-e 's/^\([0-9a-fA-F]*\) [ABCDGRSTVW] \(_end\)$$/\#define VO_\2 0x\1/p'
 
 quiet_cmd_voffset = VOFFSET $@
       cmd_voffset = $(NM) $< | sed -n $(sed-voffset) > $@
@@ -84,7 +85,14 @@
 $(obj)/voffset.h: vmlinux FORCE
 	$(call if_changed,voffset)
 
-sed-zoffset := -e 's/^\([0-9a-fA-F]*\) [ABCDGRSTVW] \(startup_32\|startup_64\|efi32_stub_entry\|efi64_stub_entry\|efi_pe_entry\|input_data\|_end\|z_.*\)$$/\#define ZO_\2 0x\1/p'
+sed-zoffset := -e 's/^\([0-9a-fA-F]*\) [ABCDGRSTVW] \(startup_32\)$$/\#define ZO_\2 0x\1/p' \
+		-e 's/^\([0-9a-fA-F]*\) [ABCDGRSTVW] \(startup_64\)$$/\#define ZO_\2 0x\1/p' \
+		-e 's/^\([0-9a-fA-F]*\) [ABCDGRSTVW] \(efi32_stub_entry\)$$/\#define ZO_\2 0x\1/p' \
+		-e 's/^\([0-9a-fA-F]*\) [ABCDGRSTVW] \(efi64_stub_entry\)$$/\#define ZO_\2 0x\1/p' \
+		-e 's/^\([0-9a-fA-F]*\) [ABCDGRSTVW] \(efi_pe_entry\)$$/\#define ZO_\2 0x\1/p' \
+		-e 's/^\([0-9a-fA-F]*\) [ABCDGRSTVW] \(input_data\)$$/\#define ZO_\2 0x\1/p' \
+		-e 's/^\([0-9a-fA-F]*\) [ABCDGRSTVW] \(_end\)$$/\#define ZO_\2 0x\1/p' \
+		-e 's/^\([0-9a-fA-F]*\) [ABCDGRSTVW] \(z_.*\)$$/\#define ZO_\2 0x\1/p'
 
 quiet_cmd_zoffset = ZOFFSET $@
       cmd_zoffset = $(NM) $< | sed -n $(sed-zoffset) > $@
